Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Harmonize spring / spring.security versions with GeoServer #1231

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Harmonize spring / spring.security versions with GeoServer #1231

merged 2 commits into from
Apr 22, 2024

Conversation

mprins
Copy link
Contributor

@mprins mprins commented Apr 11, 2024

@aaime
Copy link
Member

aaime commented Apr 22, 2024

I don't understand the QA failure:

Error: 1,225 [ERROR] Failed to execute goal com.diffplug.spotless:spotless-maven-plugin:2.20.0:check (default) on project gwc-core: The following files had format violations:
Error: 1,225 [ERROR]     src/main/java/org/geowebcache/locks/MemoryLockProvider.java
Error: 1,225 [ERROR]         @@ -14,26 +14,26 @@
Error: 1,225 [ERROR]          ·*/
Error: 1,225 [ERROR]          package·org.geowebcache.locks;
Error: 1,225 [ERROR]          
Error: 1,225 [ERROR]         -import·org.geotools.util.logging.Logging;
Error: 1,225 [ERROR]         -
Error: 1,225 [ERROR]          import·java.util.concurrent.ConcurrentHashMap;
Error: 1,225 [ERROR]          import·java.util.concurrent.atomic.AtomicInteger;
Error: 1,225 [ERROR]          import·java.util.concurrent.locks.ReentrantLock;
Error: 1,225 [ERROR]          import·java.util.logging.Level;
Error: 1,225 [ERROR]          import·java.util.logging.Logger;
Error: 1,225 [ERROR]         +import·org.geotools.util.logging.Logging;

I have an up-to-date main and the imports order is:

import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.codec.digest.DigestUtils;
import org.geotools.util.logging.Logging;
import org.geowebcache.GeoWebCacheException;

Running spotless:apply does not change it...

@mprins
Copy link
Contributor Author

mprins commented Apr 22, 2024

Neither do I, this was an online edit.. so I've updated this PR to the main branch

@aaime aaime merged commit 96a4cba into GeoWebCache:main Apr 22, 2024
7 checks passed
@aaime
Copy link
Member

aaime commented Apr 22, 2024

Merged. Unsure about backports.

@mprins mprins deleted the patch-1 branch April 22, 2024 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mprins @aaime